Merge from mainline.
authorPaul Eggert <eggert@cs.ucla.edu>
Sat, 12 Feb 2011 20:00:35 +0000 (12:00 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Sat, 12 Feb 2011 20:00:35 +0000 (12:00 -0800)
commit9312cc1038c21fdd3692a73de8d28d112b8d215f
treec1333d9c1acfbdb18a2ec4b123710f691c8b37b7
parent4e6de32c5aaa8ce3f2440037807b82b4f7d0371b
parent7d32a99a987ecf7a349eee4bf64779cfc528d5fc
Merge from mainline.
src/ChangeLog